From 07232f3e058d716d26bd890a7449330b6beb85b2 Mon Sep 17 00:00:00 2001
From: Camm Maguire <camm@debian.org>
Date: Thu, 19 Mar 2026 21:14:51 +0000
Subject: [PATCH] [PATCH] <short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.


Gbp-Pq: Name Version_2_7_2pre14
---
 cmpnew/gcl_cmpcall.lsp   | 18 ++++++++++++------
 git.tag                  |  2 +-
 mod/gcl_defpackage.lsp   |  4 +---
 unixport/init_raw.lsp.in |  2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/cmpnew/gcl_cmpcall.lsp b/cmpnew/gcl_cmpcall.lsp
index 9368c35..6ff2fd1 100644
--- a/cmpnew/gcl_cmpcall.lsp
+++ b/cmpnew/gcl_cmpcall.lsp
@@ -276,12 +276,18 @@
 (defun commasep (x)
   (mapcon (lambda (x) (if (cdr x) (list (car x) ",") (list (car x)))) x))
 
-(defun ms (&rest r) 
-  (apply 'concatenate 'string 
-	 (mapcar (lambda (x) 
-		   (cond ((listp x) (apply 'ms x))
-			 ((stringp x) x)
-			 ((write-to-string x)))) r)))
+(defun ms (&rest r)
+  (labels ((msh (x)
+	     (cond ((< (length x) (1- call-arguments-limit))
+		    (apply 'concatenate 'string
+			   (mapcar (lambda (x)
+				     (cond ((listp x) (msh x))
+					   ((stringp x) x)
+					   ((write-to-string x))))
+				   x)))
+		   ((let ((y (nthcdr (- call-arguments-limit 2) x)))
+		      (concatenate 'string (msh (ldiff x y)) (msh y)))))))
+    (msh r)))
 
 (defun nords (n &aux (i -1))
   (mapl (lambda (x) (setf (car x) (incf i))) (make-list n)))
diff --git a/git.tag b/git.tag
index d415ef4..b8af7a5 100644
--- a/git.tag
+++ b/git.tag
@@ -1 +1 @@
-"Version_2_7_2pre13"
+"Version_2_7_2pre14"
diff --git a/mod/gcl_defpackage.lsp b/mod/gcl_defpackage.lsp
index e3fdbf4..b1b59d7 100644
--- a/mod/gcl_defpackage.lsp
+++ b/mod/gcl_defpackage.lsp
@@ -67,13 +67,11 @@
 ;;; -----------------------------------------------------------------
 
 (unless (find-package :defpackage)
-  (make-package :defpackage :use '(:cl)))
+  (make-package :defpackage :use '(:cl :sloop)))
 (in-package :defpackage)
 
 (export '(defpackage))
 
-(use-package :SLOOP)
-
 (defmacro DEFPACKAGE (name &rest options)
   (declare (optimize (safety 1)))
   "DEFPACKAGE - DEFINED-PACKAGE-NAME {OPTION}*			[Macro]
diff --git a/unixport/init_raw.lsp.in b/unixport/init_raw.lsp.in
index 1b5f38c..4763afd 100644
--- a/unixport/init_raw.lsp.in
+++ b/unixport/init_raw.lsp.in
@@ -6,7 +6,7 @@
 (make-package :compiler :use '(:cl :si :cstruct))
 (make-package :sloop :use '(:cl))
 (make-package :ansi-loop :use'(:cl))
-(make-package :defpackage :use '(:cl))
+(make-package :defpackage :use '(:cl :sloop))
 (make-package :tk :use '(:cl :sloop))
 (make-package :fpe :use '(:cl))
 (make-package :cltl1-compat)
-- 
2.30.2